]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
appDisplay: Call super.vfunc_unmap last
authorDaniel van Vugt <daniel.van.vugt@canonical.com>
Fri, 7 Feb 2020 09:57:19 +0000 (17:57 +0800)
committerFlorian Müllner <florian.muellner@gmail.com>
Fri, 7 Feb 2020 11:23:25 +0000 (11:23 +0000)
So as to guarantee the unmapped state sticks and doesn't get toggled
back to mapped before we return.

Being in a mapped state when `FolderIcon.vfunc_unmap()` returned was
causing an assertion failure in `clutter_actor_set_mapped` and crashed
the shell.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2170
js/ui/appDisplay.js

index 115285f32022f08679b87d0ff76d7d901e15a76c..77868722c4ff6ba684c12f62c50b5df3e5f2b7c4 100644 (file)
@@ -1525,10 +1525,10 @@ var FolderIcon = GObject.registerClass({
     }
 
     vfunc_unmap() {
-        super.vfunc_unmap();
-
         if (this._dialog)
             this._dialog.popdown();
+
+        super.vfunc_unmap();
     }
 
     open() {